Merge pull request #1159 from cantino/update_gems_for_security
Bump nokogiri and uglifier for security
Andrew Cantino
共有 2 个文件被更改，包括 9 次插入 和 9 次删除
+ 2
- 2
Gemfile
@@ -85,7 +85,7 @@ gem 'liquid', '~> 3.0.3' |
||
| 85 | 85 |
gem 'mini_magick' |
| 86 | 86 |
gem 'mysql2', '~> 0.3.16' |
| 87 | 87 |
gem 'multi_xml' |
| 88 |
-gem 'nokogiri', '~> 1.6.4' |
|
| 88 |
+gem 'nokogiri', '1.6.7.rc4' |
|
| 89 | 89 |
gem 'omniauth' |
| 90 | 90 |
gem 'rails', '4.2.4' |
| 91 | 91 |
gem 'rufus-scheduler', '~> 3.0.8', require: false |
@@ -95,7 +95,7 @@ gem 'spectrum-rails' |
||
| 95 | 95 |
gem 'string-scrub' # for ruby <2.1 |
| 96 | 96 |
gem 'therubyracer', '~> 0.12.2' |
| 97 | 97 |
gem 'typhoeus', '~> 0.6.3' |
| 98 |
-gem 'uglifier', '>= 1.3.0' |
|
| 98 |
+gem 'uglifier', '~> 2.7.2' |
|
| 99 | 99 |
|
| 100 | 100 |
group :development do |
| 101 | 101 |
gem 'better_errors', '~> 1.1' |
+ 7
- 7
Gemfile.lock
@@ -191,7 +191,7 @@ GEM |
||
| 191 | 191 |
evernote_oauth (0.2.3) |
| 192 | 192 |
evernote-thrift |
| 193 | 193 |
oauth (>= 0.4.1) |
| 194 |
- execjs (2.3.0) |
|
| 194 |
+ execjs (2.6.0) |
|
| 195 | 195 |
extlib (0.9.16) |
| 196 | 196 |
faraday (0.9.1) |
| 197 | 197 |
multipart-post (>= 1.2, < 3) |
@@ -298,7 +298,7 @@ GEM |
||
| 298 | 298 |
method_source (0.8.2) |
| 299 | 299 |
mime-types (2.6.1) |
| 300 | 300 |
mini_magick (4.2.3) |
| 301 |
- mini_portile (0.6.2) |
|
| 301 |
+ mini_portile2 (2.0.0.rc2) |
|
| 302 | 302 |
minitest (5.8.1) |
| 303 | 303 |
mqtt (0.3.1) |
| 304 | 304 |
multi_json (1.11.2) |
@@ -311,8 +311,8 @@ GEM |
||
| 311 | 311 |
net-ssh (>= 2.6.5) |
| 312 | 312 |
net-ssh (2.9.2) |
| 313 | 313 |
netrc (0.10.3) |
| 314 |
- nokogiri (1.6.6.2) |
|
| 315 |
- mini_portile (~> 0.6.0) |
|
| 314 |
+ nokogiri (1.6.7.rc4) |
|
| 315 |
+ mini_portile2 (~> 2.0.0.rc2) |
|
| 316 | 316 |
oauth (0.4.7) |
| 317 | 317 |
oauth2 (0.9.4) |
| 318 | 318 |
faraday (>= 0.8, < 0.10) |
@@ -510,7 +510,7 @@ GEM |
||
| 510 | 510 |
ethon (>= 0.7.1) |
| 511 | 511 |
tzinfo (1.2.2) |
| 512 | 512 |
thread_safe (~> 0.1) |
| 513 |
- uglifier (2.7.0) |
|
| 513 |
+ uglifier (2.7.2) |
|
| 514 | 514 |
execjs (>= 0.3.0) |
| 515 | 515 |
json (>= 1.8.0) |
| 516 | 516 |
unf (0.1.4) |
@@ -587,7 +587,7 @@ DEPENDENCIES |
||
| 587 | 587 |
multi_xml |
| 588 | 588 |
mysql2 (~> 0.3.16) |
| 589 | 589 |
net-ftp-list (~> 3.2.8) |
| 590 |
- nokogiri (~> 1.6.4) |
|
| 590 |
+ nokogiri (= 1.6.7.rc4) |
|
| 591 | 591 |
omniauth |
| 592 | 592 |
omniauth-37signals |
| 593 | 593 |
omniauth-dropbox |
@@ -624,7 +624,7 @@ DEPENDENCIES |
||
| 624 | 624 |
typhoeus (~> 0.6.3) |
| 625 | 625 |
tzinfo (>= 1.2.0) |
| 626 | 626 |
tzinfo-data |
| 627 |
- uglifier (>= 1.3.0) |
|
| 627 |
+ uglifier (~> 2.7.2) |
|
| 628 | 628 |
unicorn (~> 4.9.0) |
| 629 | 629 |
vcr |
| 630 | 630 |
webmock (~> 1.17.4) |